trending working
changed query for trends
merge fixes