Basic search working
Fix problems with searching