Fixed an issue where only the first 20 entries were shown