Fixing reports (more logical behavior in error cases) + small search storage objects refactoring