Fix issue where default model/view is always chosen