Adjusting queries to new lole calc