I think this comment is for @rnowm :-p Do you agree Arnau regarding getting back that piece of code? :)