Review comments addressed.
Merge pull request #681 from aodn/layer_switcher_filtering

Review comments addressed.