fix bugs, get Catelogs quicker