Edit QueryHandler