Url and Collection Fixes and improvement