Added IDynamic, Index query bug fix