Fix ordering and errros on index