Removed redundant key handling code
Added ctrl/cmd+shift+p for searching