Refreshed entity and field module to pick up filters