Update where the domain and date format check includes get called

Do this to avoid duplicate function call errors