updated queries to be much more efficient in the case where there are no only_following subscriptions