[BUGFIX] Follow-up to Queries don't respect MM_match_fields

Fixed two small glitches which escaped us in the review of
https://review.typo3.org/#/c/29713/.

Resolves: #10487
Releases: 6.2
Change-Id: I6425835a3aa349ac47ab0a01cf1241be2df6d187
Reviewed-on: https://review.typo3.org/29821
Reviewed-by: Marc Bastian Heinrichs
Tested-by: Marc Bastian Heinrichs
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring