Keep up template renaming with edge branch code
Fix issues list sorting and displaying