Made dealing with multiple projects a problem of the query