Minor filtering changes.
Minor highlighting  changes.
Minor highlighting  changes.