Product set refactoring + update editors + fixes