[QE-1108] Improvements