#610 adding transfer location tag support