reduced query to minimum

indent and code markup changes