Fixing the selector to prefill billing info