Improved tokenization and search