Performance Improvement on Staffview