Normalize filter options. Still to add tighter constraints on the option values. Update tests.