Fixed markup.
Modified database so key is always unique (more elegant version of anna's fix)