Impove access control with admin and enabled filters