bring back tooltips, but fix order for flag so that it is rendered
Merge pull request #1302 from jay-hodgson/release-66

bring back tooltips, but fix order for flag so that it is rendered