Better handle limiting list