Fixed more issues with selecting the correct cross domain object