PIM-3363 : fix handlers and missing saves