Improve keywords for key pages
Merge branch 'trunk' of github.com:voer-platform/vpw into trunk