Fix handling of extra markup for user partial