Merge "Avoid master queries when old filter checks are viewed"