Did that in https://github.com/landryb/georchestra/commit/2fad984c2c5a337f729c736b56c37f66bd4f3376 but in some cases it seems to trigger a strange behaviour in the multilayer query usecase. That's where i'm a bit lost at all the behaviour changes involved... and it needs more actual testing.