Fix location swapping which stopped AI from being able to suggest properly