Added a test to check for this.
Merge branch '39-sort-buttons-search-page' into devel