Reorder goal search for efficiency

Better to search first in places where the goal is most likely to be!