Fix compatibility with other filters and ordering