Even more work on extended index queries