resolve entitystate
Revert "resolve entitystate"

This reverts commit f41c95a583333999d748c442c4fd6aec61bd49d8.
resolve entitystate and expression