Fixed some arrays not fully detected
Escaped template comments
Fixed database issue