Change -get-single and -connect-landmark functionality