improved some query performace, denormalization