Bug: truncate only 's' plurals and plural refactor