Update to Angular and React SPA templates to handle 404 on client
and change #s=* to use new query string option