More grid features and hive query enhancements