themarker-fix comments and enhance filters.