[INV-414] Order search results

@clicktravel-craig Ready for review. thanks J
Static imports are preferable to aid fluency of code.