Fixed up wrong usage of initial states, regretted Query module.