Temp fix for search on paginated list
Merge branch 'master' into gh-pages
compile