use match query if tokens <== 2 in beta