Fixed issues regarding drop to frame/state functionality

Change-Id: Ide164e5f738be91e2df141fc0cd3ec9e42160a34
Signed-off-by: mstegmaier <michael-1.stegmaier@uni-ulm.de>