Added change-handler-on-click to index