Fixed suggestion mappings - now uses custom analyzer