Remove collection names param, bug fixes