Update url template tag, and make urls more explicit