Moving filter options into advanced filter UI