I've reverted most of this class back to filter https://github.com/tractorcow/sapphire/blob/3.2-pdo-connector/model/Hierarchy.php#L616