[KFSQA-840] Added some fixes from the initial feature review.