* Rename files to better match class name * Don't pass setContent to QueryParser; use a generic event instead