fetch all tree levels for query fields
fix some tests