changes supporting corrrect XBEL parsing and retrieval