correctly handle single field names ending in 's' in editor