Added code to fix uniqueness of GAUL entities