made boundary classifier and query handler