added auto router
added filtering and better code coverage