MDL-29995 filters - consider leacy filters and locations deprecated in 2.2