removed weird extra dependencies by issuing better queries