Added a handler that handles simple query results