Fixed internal issue 10. When location tab is selected the wrong fields
are displayed. Invalid object attribute was used to fill input