Added ordering of conditions to be alphabetical order

Reviewer: Dan V

Issue: none