Fix answer sort order and non-blank cards