add as query handler.
Merge pull request #382 from forumbyr/master

add as query handler.