fixed semantics in state service, controller, and index