[INV-414] Order search results

@clicktravel-craig Ready for review. thanks J
I'm stressing the usage of matching multiple cases in switch statement.