Proper filtering by milestone