Adding multi-criteria order querying, fixing 2->3 bugs