Fixed construction of filter when deleting from a table
with > 1 primary key component