hacky support for findQuery
build