fix issues
Add routing and filtering