Preserve page size on search
Merge branch 'master' into geordi-16