fixed query one (ugly hack)