fixed regexp and only basic uploader