Simple rework of Filter API
final field
Master rework
Master rework