OAK-1980 - Use index on non-root node

Applying OAK-1980.patch. Thanks Marcel.