improve mentions query