Readjusted mapping order to allow specific ones to match before .*