add multi-dimensional query support