add support for hashtags, remove dependancy on clientID