Improve tile state update
