CYB-367 - Improved list template