WIP refinements to tracks database view