Fixing Search and Data Access Parity

Details coming soon.