combined active field provider
cleanup
cleanup
cleanup
moved logic from template to provider