Complete tax rules and fix other controllers