Support taggings
fix bug not to delete query actually (this cause unexpected tags are left)