ES > 1.0.1 fixes for AND Filter and GeoBoundingBoxFilter