Fix ordering issue of filters