added crash recovery and manual query parsing (for recovery)

need to better test Query.parseQueryArgs