add search and tweaks