added tighter limits on urls to reduce ambiguity