#17195 remove agencyid from bogbus select list + update test