Fix rebase conflicts
Revised advanced search filter survey answers
Working with sidebar search
More sidebar search adjustments