update WAR to use ES Query classes
use dict comprehension