Fixed issue with database apostrophes