Change the port number back to 5000
Merge branch 'search-server'