Could simplify by setting the default value to '*.*' instead of None