improving design of search_fragment
solving some conflicts
solving some conflicts again