Change default search mapping to new field names
revert to lower case queries
Correct function call
Fix a few tests