Fixed wrong Search()
Removed old code that caused errors with some expressions
Resynced some changes from diffed decompiled dll, recent source changes were lost