Some fix
Enable autocomplete on @key and =key