Also slightly refactored the starttag optimization code.
Attach a file by drag & drop or click to upload
