Several changes, added default query from looker for changing