Fixed n+1 database call on calculators