Search feature fixed, more misc tweaks