Search almost working now