Move short_url to property