Fix find_category method
Improve shared partial products