improved findOne support
improved observer driver fetching