*8370* removing references to {}
*8391* fixing plural(s)