more work on supporting Map/include values
Implement #527