Improve limit check for smart collections