fixed query subject in generator