wip of location drop downs
small fix for null current values