Use new combined spatial output task
Further refine address query