Merge "Don't show Note and Nickname if they are empty database rows; some clean up"