Renaming of DTO broke some work order detail, more merge fixes, added search for site