Fix map only and list only buttons