Cleanup, searching now all fields