[discovery] Search: How should question marks be handled?