start revising advanced search to fit within P3 better