Last fixes to Router coming from real app testing. It actually works :bowtie: (#16)