add new query + remove senseless typecheck in Substring