extract into method

shift_query?