Improving the Align-Then-Fold Approach for RNA Secondary Structure Prediction