[MAESTRO-2917] fix condition and copy to POST