rewriting of validation queries to suite flat tables
updated change_log.txt
fixed conflicts in change log