only return results for IFA if ifa_id is available
Merge branch 'develop' into uat