Refactored Filter and separated the handling of Date and DateTime. Also refactored how operational XML is generated and removed hard-coded XML scattered in classes in favor of a centralized mechanism for generating generic XML.