Queries improved and other have been added