IndexQuery changed to use keys. tests are green