After a few hours juggling with the databse

After a few hours juggling with the database I think I solved all issues with the system and removed the domain mapping hack. If someone finds any hitches just call us 🙂