initial work on converting route filters into event listeners
Merge branch 'filter-events' into develop
reorganize route code