Added POJO to model search results and improved search