continue entitiy listing & entity edit