Removed subject page state and fixed a tiny mistake of mis-setting the current state.