fixed #381, xsd rules
more powerful catalogue builder