A fix for the search filtering, FEND-843
 FEND-841: search pagination persists when new query entered(>page1)
Merge branch 'master' into search_fix
A fix for FEND-835, I think this captures all of the use cases
Merge branch 'master' into jan_r2