Using Search datatype and Upgrading layout fix