add @,+ to keywords to improve completion