core command query handler move to command

Signed-off-by: Sven Nierlein <sven@nierlein.de>