entryLoaded fix
autocomplete merge