Fixed alias searching