Some fixes, and sort RapidPro forms lexicographically