Fixed the hard coded strings