Fixed the whole "plural name undefined index" rigamarole.