The Web Help theme should use the new CQL search.It should also integrate with the SCM search: Use the current version, variant and language if the SCM search is enabled in the space.