Look at the latest commit, I'm taking it in account and checking if its `=/= ""` (and using `""` as a default value).