image flow refactoring and service request new fixes