Another fix to URL parameters collection, may require further improvement