Replace aws group filter with tag filtering