Added EnterQueryById