Fixed bad merge
Fixed lagging error from camelCase to non-camelcase days
Fixed selection of new object in navigation tier