Search now works, but with some bugs