some fixes

new query