Subject map save state fixes