Remove a comment in view and add DB indexes