Update current_state when status changed
Change queries to use current_state