fix more mistakes caused by change from entity_slug to entity_id