Fix autocomplete, add icons for items and containers