Some more fixes for entity finder implementation