Updated the @Path selectors to be more specific and only allow numbers
where appropriate.