PUC certificate to be made mandatory soon for filling fuel at pumps