improved situation JSON query