Fixed issue with calid filter.