Cleaned up routes
Changed flow of how searches are processed