fixes findEntity issues