WhereOnEarth - Fixing some bugs