Correctly handle mention keywords