Add tag-editing and basic completer