Increased the limit of locations from 10 to 100.

Changed the order in the which the locations are retrieved.