Use ServiceLocatorAwareTrait.
Use EventManagerAwareTrait.
Merge branch 'develop' into advanced-search
Modify advanced search form directly using JS and submit as normal.