Map search and list keys to ctrl + some cleanups