Fix querying of architecture for entries without subarch string