fix namehandler to work if no language header is present