content search: address several PR comments