Changed the order filter definitions from ID to class for re-usability.