Fix bad merge which removed advanced search

@palli could you review.