improve DB query for recursive CLI searches/downloads [RTFACT-21420]