Short-term fix for neighborhood term and taxonomy mass deletions...
Merging patch in master back to staging...