modified location of screenshot
fixes #9 - improvements to handling of maps in query sets
removed old code