Fix advanced search due to merge