Don't sort search results by default. See #12310
Merge pull request #2558 from will-moore/rebased/develop/search_id_order_bug_12310

Search id order bug 12310 (rebased onto develop)