Updated so that SEO friendly URLs (using dashes) resolved correctly