YAHOO-214 -- QE add little changes after review