Exclude simple fields from data selection and resolve simple inter field references

[juliangruendner]

Exclude simple fields from data selection and resolve simple inter field references