Merge pull request #381 from CruGlobal/MH-1029

Consider the pagination page in the filters
Fixes edit surveys in profile page
Merge branch 'MH-1030' into dev