Added map_keys and map_values functions
Fix Exception when using subscript operator in aggregation query