Avoid nested parallel querying which results in deadlock sometimes
3 files changed