Fixed match service to return 404 if it can't find a match