Fix the default page size
Merge branch 'newMapSearch' into integration