Save current query at onSaveInstanceState

Working on issue #8