Resolving destinations tidy-up (more)