Improved URL usage

Refs #608