Fix removing items from index