Got search working again