Changed how fields and search are handeled