renamed model selection dialog, removed unused filters, and added
null-checks