Support Field vs Field queries

[alirezanet]

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context.

Fixes #155
Fixes #153

Type of change

• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist

• I have performed a self-review of my code
• I have added tests that prove my fix is effective or that my feature works
• I have made corresponding changes to the documentation
• I have commented my code, particularly in hard-to-understand areas
• New and existing unit tests pass locally with my changes