Remove BitBucket references
Skip zero-track matches (fix #942)