addon db created + query
Merge conflicts for addons db