Prepping for tweetbudget, many improvements to user querying