Hi Gilles, I have commented on http://jira.xwiki.org/jira/browse/XWIKI-951. Could you please let me know if it's ok to apply your patch as is or if you still need to submit and updated version of it. Thanks -Vincent