Fixes on entities
Fix search