Fixed AttributeError: 'S' object has no attribute 'fields'
Merge branch 'raw_search'