FIX filter empty tokens after dirty tweaking