make option passing to Query sane
Allow limiting results. Doesn't play nice with context.