queries work
fixed merge with new queries