fixed search and ssome tweaks