Fixes and updated search repository in IUnitOfWork