use limit instead of count
update changelog