Add routes & fix filters