First pass at clear / close support
Fixed several crashing issues
Updating the validation regex for filter names