search related fixes, enhancements