Removed dependency on caption_filter