Completed target_contact entity; added where condition to every table