Resolve #3918: Search functionality in Entity list