When querying for a keyword, also return #keywords and @keyword

[GoogleCodeExporter]

When querying for a keyword, also return #keyword and @keyword.

Original issue reported on code.google.com by AlecMGo on 6 Sep 2011 at 5:16