Added filtering

Optional Keyword now filters results.  Suggestion and code provided by
Felipe Manoeli.