Merge "Fix Id-searches endpoint performance degradation"