Fix for {PER} in queries...