Fix for monk query option