PAS-1797 maptool pickup functionality