XCOMMONS-457: Improve generic XML syntax
* better composite filter
(cherry picked from commit 89b1ba932d3269943080d702b4789bca946bc642)