modified query to fit new hbase schema