diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/ReferenceRepository.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/ReferenceRepository.java
index 9c5ff801..96b7611b 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/ReferenceRepository.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/ReferenceRepository.java
@@ -19,6 +19,6 @@ public interface ReferenceRepository extends GsrsVersionedRepository<Reference,
     @Query("select s from Reference s where CONCAT(s.uuid, '') like ?1%")
     List<Reference> findByUuidStartingWith(String partialUUID);
     
-    @Query("select r.id from Reference r")
+    @Query("select r.uuid from Reference r")
     List<UUID> getAllIDs();
 }
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/ReferenceEntityService.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/ReferenceEntityService.java
index 8851df71..d0b42b5d 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/ReferenceEntityService.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/ReferenceEntityService.java
@@ -235,7 +235,6 @@ protected Optional<UUID> flexLookupIdOnly(String someKindOfId) {
 
 	@Override
 	public List<UUID> getIDs() {
-		// TODO Auto-generated method stub
-		return new ArrayList<UUID>();
+		return repository.getAllIDs();
 	}
 }