add janky query app. refactor api handler. close 6