Paper over a tree d&d bug +...

Bandage reordered effect selecting so if it can't find the given
element. That code needs to be changed so it picks the correct effect
anyway.