Fixed the setup for selection

No more hard-coded Poms and Spiders!