fix: SQL COUNT with GROUP BY to prevent incorrect row returns

fix: SQL COUNT with GROUP BY to prevent incorrect row returns #8502