CLUB-576, fixing flip on ? and links