TYNSTEP-674 More cleaning-up work on lexicon popup