Reduced returned message count from 200 to 20