Setup widget to use term taxonomy links if set, a little code cleanup too