Cleaned up searchObject a little