Restoring IndexQuery to its original state

 - some changes were made when starting work on the scala helpers but are no more used