some fixes for index