fix: avoid mapped type during filter query type narrowing

fix: avoid mapped type during filter query type narrowing #1670