Updated order filters, closes #332