Added check for encounter already in system
Added queryNew and queryFrequent changes