add query & fixes indexInParent