experimental change for tag completion