Added routing by token, fixed searches