changed lookup logic and cate filters