Slightly improved handling of URL properties/config