fixes for names ending with dashes and dates in the DB