Minor fix (better extraction of original value in case of replacement and custom POST injection mark)