Add fallback logic for job name and build tag in build data

Add fallback logic for job name and build tag in build data #924