Fix autocomplete, make it work with constants