Revert "Expand list size limit 20 to 50"

This reverts commit ddf4f64783214cdb2d19268b5543eaef7d2be0da.