Rework dictionary check so that it does not hit the CP on each suggest