Merge branch 'search_assoicated_children_records' into 'master'

Avoid using wildcard search to find the associated children records

See merge request !561