Got search working after refactor