Url updates and trim trailing spaces