Fixed improper aquifer list order

I noticed yesterday that the aquifer list  wasn't displaying the correct
order in all cases.  I've addressed that now, and also addressed a
problem where the sorting algorithm failed to include some items.