router method changes, improved filters and routing