Scheduling checks and some query updates