Improved fetching plans

all combinations are now working