Entity finder fixes

Signed-off-by: Alexander Shepetko <a@shepetko.com>