Merged in improved list_paths and list_hashes correlated subquery implementations