LPS-43061 improve the collection (with @shyangzhou's help)