Improvements

Query always locally loaded.
HTML Formatted