Search enhancements
Fixed search shortcut bug