Fix the fix: We had to pre-filter entries for correct separator handling