Figured out better way to manage filtering