[#48] changed the search method and added human readable variable names