Implemented fielded searching.
Fixed more edge case problems.