Move lookup settings to the right place

Change-Id: I167cc2235fe99ae278bb0908701c4a3e145ebb94