Fix tag selection in setup