added LSI Query support