improvements regarding Issue state