CAAERS-6326 Webapp performance improvement