Putted back _composed_query spec