Starting to make findEntity look in the "top" layer only
Tweaking dockerfiles