cleanup contextKey strings
correctly split return targets