changed how filters and orders are applied