Idpicker fixes (work folder not respected as expected).