moved query to column forms