state mapping added to transformation
  moved eiq to queries folder