fix "Uses" issue #3624, #3609
AT: committing changes to the TaxEditor Post second round of code review