fixing old_ query retrievale clusterfuck