fixed sorting bug
icons
model now checks for staged attributes