Got rid of FilterContext: it is now encapsulated within FilterMenu.

12 jobs for search-integration in 30 minutes and 28 seconds (queued for 1 second)