Fixes because the COUNT / LIMIT query is not efficient enough