Queryhandler + lib fix