Refactor index action
fixes