Reenable remaining constants in queries example