Some code and comment improvements for the new 'find query' MongoDB option

Change-Id: I0a9d4bfa12bb4bed4af9be9e83ce3d2d62a5f9a0