Checkign for the url_set attribute
Merge branch 'hotfix/templatebug2'