Swapped order on query to try to get outer join working.