oopsie entity_id fix and removed limit