minor interface changes; bugfix (empty query string lead to error)