Update controller, add support for fetching single email