Improve show with tax option support