Fixes that too many db calls for good now.