Fix tag choices bug + isObject = false if missing