fixed data issue in db and updated model to remove unnecessary regexes