Fix unicode strings matching

Rollback previous changes, command matching is now working correctly.