Replace query with underscore and remove amd/global support