fixes a regression introduced by #1910

Changing the context when a keyword is specified, defeats the purpose of a keyword.

Some regression tests where added, to prevent this in the future.
Merge pull request #1919 from stefanpenner/fixCollectionViewContextChangeRegression

fixes a regression introduced by #1910