improve route path and fix null on filter