Fixes queries for multiple tweets and tracks
Merge branch 'queryFix' into dev