added a fix for Date replacement
updated basic_web