Fixed bug searching wrong entitie