Updated for new Public Search features.