Fix and cleanup database schema
Final work on scraper task