updated query functions and calls to differentiate between calendar and non-calendar searches