Add query normalization function, track socket clients per query.