Added single, comments, no-results and HTML5 support