added queries and text for more tasks
changes to support schema changes