performance improvements - CCTV Knowledge Base