Adds filters to matrix and fixes general routing behavior