[BUGFIX] Refactor record querying in deep nested structures in recycler