Fix validations
Fix validations
Add after save index