some fixes
some fixes for index