CLUB-576, fixing flip on ? and links
Merge pull request #685 from onepercentclub/feature/CLUB-576

CLUB-576, fixing flip on ? and links