Resolved navigation error due to singular/plural issues