Fix regression in where generation, better syntax for limit()