Adds better logic checking for track overview