Fixed sorting bug in smarterTrends and redid include ordering