WebSearch: several fixes for CDS

These are a few small commits (3 for CDS, 2 generic) for the WebSearch module.