Update "\Flagged" handling; some cleanup