FIX: Fixes in Save / Update method to prevend empty product entries