I'd like the user to think as little as possible about this. The neighbor tags would just show up along with the resident ones, and there's a convenient button to add it in the aggregation or exclude it.

The discovery thing sounds great! It can be an addition 🤔.