Fixing and refectoring scripts for import and list enterprises