add more modes to queries . Add local mode too.