Fix routing matches