FORGE-1450: Corrected autocompletion which was not working when targetEntity was null