More non-categorized repos improvements