Added query and javascript requirements