don't use router
update improvements and corrections
filter ok