Fixed filename issues
Added function to only parse filename without folder name