Fix FieldSearch Static Issue

FieldSearch is no longer static. All
related classes have been changed to
reflect this change.