Added in query support on indices