Improve performance @ Measurement Admin