Add update the current version of the object to the version on the system. Code clean up.
Shared client accessing cleanup
Fix search filters