Use only one query for non-recursive listing. Retry if got the same file name. For testing.
Rework listing