filter errors, query management and fixes
fixed tests