Controller: do not mix grid and list.

And do not let changed note where it is.
See 722045.