Move notice dialog creation to method
Remove ignored values instead of replacing them with null values