Fix fetch_units_matching