Added extra fields for second es filter