further refining entry sanitization