fixed bug with highlighting entities