Subject map save state collapse fix