fixed TODO, removed setting flag on index/create