Fixed routes and re-added white-list filter