try to add for support of white space in collection names