Fix Database schema and jQurey deprecated isResolved function
Upgrade shorty version number to allow DB upgrade