fix search and other minor tweaks