updates to query and cleaner scripts