This fixes the editor not working with branches as the
previous query would return empty for merged results
among other scenarios