LPS-34134 Improve autocomplete JSON to separate variables and types

Hi Nate,

Please keep in consideration that this task depends on AUI-873

Thanks,