Issuse #3544526: Get filename always instead of if we have an extension.

Closes #3544526

We can safely use filename even if we don't have filename extension.

Also there was two ways of checking if we have extension so removed one of them for consistency.