Execute every call only once in one query
added comment-element to all other types