Shift to Single Value Query as suggested by Eileen