changes related to search results
commit after resolving conflicts