WIP
Update spec for fielded searches
Use an alternative approach for search fields
Update after rebase
Use block strings