fix listLocations
add optimization for createObjectOptionsSupplier