Merged QueryManager changes to fit new db