Moved address settings from config db to main db