comments and fix context of find() queries