Refreshing Query fields for new entities.
Fixes #292