WIP - begin refactor for hashtag, mention, ... tables