[REVERT] revert last changes as site.tree provides all necessary data X-(