0.1.34.2 - use long query if both empty