More minor updates to URL and lang functionality