Added serving video and corrected returning json