Tidied up routes, added better search function. Still slow.
Fixed typo