Added datastore query to discovery service
POSTGRES bumped submodules