Remade queries that selected a vault on ID to only return a single instance in stead of a collection with one item in it.