switch over to KV query method