#26 Finished up live search