BUGFIX: support multiple handling in databases