Fixed query keywords option.
Merge branch 'master' of github.com:OopsMouse/event-service