Fixed tag support in runner

Change-Id: Iaa2095e64d61b09d4f0ab6f8e0e8999f60b15fb1