fixed empty token query