Adding todos for views handlers.
Fixed entity notice.