Merged two SQLs manually

Tracks + Preference