bug 1008: changed query and user output