BugFixes on Order Settings (Store Select) page