Fixes for getTrailIdWithNameAndTrailhead()