[INV-414] Order search results

Replaced if statements with switch clause