Fixed starred_hashes issue + issue with less than 100 items