fix filter on related data pull for new and current records