Tidy up filter.order parsing