Add addictive tracks query, improve view models