[MC] resolved merge conflicts after adding advanced search