Removed model queries from views and unified deck my selection method