Added filter for base, device and admin