More az database list template changes