Added back default query