Making progress on 'avs street match is null'

#438 will fix that.