Fixed search and general clean up