add search view + fix bugs