minor tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
fixed context on return from marked only mode...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>