fixes for index