Query.Limit support
cleanup limit/where