Added support for query ID, Filter, Info, changed query algorithm