#457 Add QueryHandler usage