add multi view queries support