fix model + add index