Allow matching tagged versions
Minor reordering