More fixes. budgets queries are still slow when getting items/nodes.