Resolve issue with exceptions being thrown from getWebXmlFilterOrder
Needed to import classes
Also did some general code cleanup