Always populate location list.
Merge pull request #1 from tmesser/master

Always populate location list.