Adjust to core moving to List interface for ref filtering Change-Id: Idb4333e0168a5f836bb2f3ad2c3c399f88333bdf