- second part of routing refactoring
- enquiries adding