[INV-414] Order search results

Applied review comment(s) updates.