getEntity and removeEntity of Queue updated for trigger level control