add options.context and better notFound handling