Fixed default edit value and parsing return value

Change-Id: I4eb706a00771b5e5723a80a6291e2c5b0e8ba013