Added entity names and ability to search children