[KFSQA-1007] more changes after review