Made both force and not force sync work correctly on mysql & postgres