[KFSQA-1039] some more changes and fixes