Added filtering to the target selection list