Improvements in source queries (date fix)