Add some extra quoting to support hashtags