fix queries
fix token to simplify