Worked out the plurals and made the query generation a little more quoted