Aligned the spring part and managed field set filter enablement