fixed entity finder service definitions