WIP
Update spec for fielded searches
Use an alternative approach for search fields
Update after rebase
Use block strings
Remove unused method
Fix indentation
Add a blank field when no params are present
Address injection vector