updated dacor query to fully quality tables