Address plural and singular queries
Start
Create rewrite for plural and singular queries