fixed a problem with ordering with previous/next buttons and search results with stored searches
Merge branch 'develop' into testing