Updated for filename display support