apply fixes in router; search form little improvements