Revert "fix consumer query by key/value"

This reverts commit 7786842ee6c736f069012440094ea2590e966379.
fix consumer query by key/value