Fixed remove paged query args
Merge branch 'master' into production