Replace -- with &mdash;
Add validation for filter fields