Updated search task to only store builitin data types.