Work on extended secondary index query