WIP WebSearch: improvements for master