Some url updates and trim trailing space