Revert "Rates by categories are now excluding taxes"

This reverts commit 9054ed63e20d9e8ff34ea8df1087eba05fdd79db.