URLService enhancements - fixes #1