OFC-1242 - External code list is not filtered by surveyId