YAHOO-313 QE -- little changes after review