improved index - cope with "with"