rework sites selection handling