fixed exit option, search method is mostly working