Using Search datatype and Upgrading layout fix
Merge pull request #1000 from basho/fix/er/search-dt-upgrade

Using Search datatype and Upgrading layout fix