[fix] Add support bulk query

Filed this as #67 breaks bulk processing in master