fixing old_ query retrievale clusterfuck
now including both sets of general rewrite rules - allowing us to migrate over to the new sections