improve expand_filename considerably