fix qurey by Id for operation
changes to include icons