Fix some regex parts that were too generous (e.g. hnr 24 would match with 241)