Added type selection to search frame
Misc tweaks and bug fixes