Fix BU duplication during fetching
Add router