Fix filtering by PK