Bug 313675 - [sfs] Unification of SFS Resource and Properties Views and migration to CNF: 2nd round - improvements and related bugfixes