fixed default value issue; fixed javascript issue