Fixes in namecleaner and requestID