Fixing n+1 issues on deals page