Search now works (albeit without error checking for now)