Added inline filters
Updated to m3 compat