Update and make easier to understand
Further improvements suggested by felixhayashi
Merge pull request #1294 from aelocson/patch-4

Improvements to filter grammar presentation