Create an ability to link the set buildings that turns off that timer reset, and only if you unlink them have the timer reset. This would enable people to move them without the pop-ups, and be able to look for what's behind them without the pop-ups.