Changes to accomodate address bar override and default property value