[INV-414] Order search results

Updated in accordance with review comments