Fix bug and add little feature for this app. This an internal app.