Bug fix with tag keys