Fix filtering and sorting by family