Fixed MID-1847 (serialization of SearchFilterType incorrect w.r.t. schema)
Just a few typos and details.
Fixing MID-1969, point #2.