Minor fix on schema and language catalog queries.