Fix edit and view behavior of entries