fix scope inheritance issue
fix form issues