Fix manifest includes/excludes
Fix detection of discussion threads