Add better default for limit