Model picker now uses correct view & queries