Create rewrite for plural and singular queries