Refactor: Extract construction of feature-subtrees

1 job for dev_advanced_db_management in 47 seconds