Removed count query hack for pre 1.0 versions of ES