added search commands and added mapping functionality