Issue #2008540: Rework the apis path so it searches more branches