Fixed search bar functionality. Master can now be fixed.

I broke Master, but it should be fixed now. Working code.