Fixed search fields (search itself not operational yet, but now it's just a matter of doing the query)