removed unnecessary queries
added Ferenc' queries