tools-469 properly convert query object after parsing special keys