Fix tag/location import