Fixed URL unshortening
Minor schema changes