updated interestupdator and query generator