Update CE code to include some refactor done in EE to do with import url

This is simply updating the code to match EE and avoid further conflicts related to import_data and import_url changes made on EE only.