Added proper index handler