AP11-172 more changes to get proper ANDS feed