tiny updates for right queries