More changes on  collection duplicate issue