Update from upstream
Fix some queries with double quotes
Indentation in services
Add is_boolean to dblayer function