Fix routing
Rewrite the domain check