make most injections private and remove unused ones
add SearchStringParser