Removing tracks ref.

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>
Fixing queries

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>