much changes, first of them are changes in ProductByFilter