more fixes for locationButton