Better invalidation for complex and custom fields

Field values are now prepared the same they are in where tree.