AMGA-15 Added additional condiitions to retrieve fewer results